Fall back to "fixed" if we can't get a native font in the right encoding.

Mon Nov 13 02:16:33 2000  Robert Brady  <robert@suse.co.uk>

	* gtk/gtkstyle.c (gtk_style_init): Fall back to "fixed" if we
	can't get a native font in the right encoding.

diff --git a/ChangeLog b/ChangeLog
index 3de1b7cc00082a8e82b0ebb130cf20fc23abe168..06a49220fc9dfc7ab49070d8a82dea5931c817ae 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,13 @@
+Mon Nov 13 02:16:33 2000  Robert Brady  <robert@suse.co.uk>
+
+       * gtk/gtkstyle.c (gtk_style_init): Fall back to "fixed" if we
+       can't get a native font in the right encoding.
+
 Mon Nov 13 00:09:29 2000  Robert Brady  <robert@suse.co.uk>
 
        * configure.in: Chinese .pos have been renamed to zh_CN and zh_TW
        respectively.
-       
+
 Sun Nov 12 19:11:42 2000  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtktextlayout.c (gtk_text_layout_move_iter_to_next_line):

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 3de1b7cc00082a8e82b0ebb130cf20fc23abe168..06a49220fc9dfc7ab49070d8a82dea5931c817ae 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,8 +1,13 @@
+Mon Nov 13 02:16:33 2000  Robert Brady  <robert@suse.co.uk>
+
+       * gtk/gtkstyle.c (gtk_style_init): Fall back to "fixed" if we
+       can't get a native font in the right encoding.
+
 Mon Nov 13 00:09:29 2000  Robert Brady  <robert@suse.co.uk>
 
        * configure.in: Chinese .pos have been renamed to zh_CN and zh_TW
        respectively.
-       
+
 Sun Nov 12 19:11:42 2000  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtktextlayout.c (gtk_text_layout_move_iter_to_next_line):

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 3de1b7cc00082a8e82b0ebb130cf20fc23abe168..06a49220fc9dfc7ab49070d8a82dea5931c817ae 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,8 +1,13 @@
+Mon Nov 13 02:16:33 2000  Robert Brady  <robert@suse.co.uk>
+
+       * gtk/gtkstyle.c (gtk_style_init): Fall back to "fixed" if we
+       can't get a native font in the right encoding.
+
 Mon Nov 13 00:09:29 2000  Robert Brady  <robert@suse.co.uk>
 
        * configure.in: Chinese .pos have been renamed to zh_CN and zh_TW
        respectively.
-       
+
 Sun Nov 12 19:11:42 2000  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtktextlayout.c (gtk_text_layout_move_iter_to_next_line):

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 3de1b7cc00082a8e82b0ebb130cf20fc23abe168..06a49220fc9dfc7ab49070d8a82dea5931c817ae 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,8 +1,13 @@
+Mon Nov 13 02:16:33 2000  Robert Brady  <robert@suse.co.uk>
+
+       * gtk/gtkstyle.c (gtk_style_init): Fall back to "fixed" if we
+       can't get a native font in the right encoding.
+
 Mon Nov 13 00:09:29 2000  Robert Brady  <robert@suse.co.uk>
 
        * configure.in: Chinese .pos have been renamed to zh_CN and zh_TW
        respectively.
-       
+
 Sun Nov 12 19:11:42 2000  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtktextlayout.c (gtk_text_layout_move_iter_to_next_line):

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 3de1b7cc00082a8e82b0ebb130cf20fc23abe168..06a49220fc9dfc7ab49070d8a82dea5931c817ae 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,8 +1,13 @@
+Mon Nov 13 02:16:33 2000  Robert Brady  <robert@suse.co.uk>
+
+       * gtk/gtkstyle.c (gtk_style_init): Fall back to "fixed" if we
+       can't get a native font in the right encoding.
+
 Mon Nov 13 00:09:29 2000  Robert Brady  <robert@suse.co.uk>
 
        * configure.in: Chinese .pos have been renamed to zh_CN and zh_TW
        respectively.
-       
+
 Sun Nov 12 19:11:42 2000  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtktextlayout.c (gtk_text_layout_move_iter_to_next_line):

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 3de1b7cc00082a8e82b0ebb130cf20fc23abe168..06a49220fc9dfc7ab49070d8a82dea5931c817ae 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,8 +1,13 @@
+Mon Nov 13 02:16:33 2000  Robert Brady  <robert@suse.co.uk>
+
+       * gtk/gtkstyle.c (gtk_style_init): Fall back to "fixed" if we
+       can't get a native font in the right encoding.
+
 Mon Nov 13 00:09:29 2000  Robert Brady  <robert@suse.co.uk>
 
        * configure.in: Chinese .pos have been renamed to zh_CN and zh_TW
        respectively.
-       
+
 Sun Nov 12 19:11:42 2000  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtktextlayout.c (gtk_text_layout_move_iter_to_next_line):

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 3de1b7cc00082a8e82b0ebb130cf20fc23abe168..06a49220fc9dfc7ab49070d8a82dea5931c817ae 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,8 +1,13 @@
+Mon Nov 13 02:16:33 2000  Robert Brady  <robert@suse.co.uk>
+
+       * gtk/gtkstyle.c (gtk_style_init): Fall back to "fixed" if we
+       can't get a native font in the right encoding.
+
 Mon Nov 13 00:09:29 2000  Robert Brady  <robert@suse.co.uk>
 
        * configure.in: Chinese .pos have been renamed to zh_CN and zh_TW
        respectively.
-       
+
 Sun Nov 12 19:11:42 2000  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtktextlayout.c (gtk_text_layout_move_iter_to_next_line):

diff --git a/gtk/gtkstyle.c b/gtk/gtkstyle.c
index 69e9f681c0947bd7ec5a76b8b033a43a0b05b8bf..bbc760f9be76094bb192e16a017d0644fbfc1cc3 100644 (file)
--- a/gtk/gtkstyle.c
+++ b/gtk/gtkstyle.c
@@ -376,8 +376,11 @@ gtk_style_init (GtkStyle *style)
     {
       default_font = gdk_font_from_description (style->font_desc);
 
-      if (!default_font)
-       g_error ("Unable to load default font.");
+      if (!default_font) 
+       default_font = gdk_font_load ("fixed");
+
+      if (!default_font) 
+       g_error ("Unable to load \"fixed\" font!");
     }
   
   style->font = default_font;